tooltip: Stop using gdk_surface_get_user_data
authorMatthias Clasen <mclasen@redhat.com>
Sat, 23 Feb 2019 21:55:20 +0000 (16:55 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 24 Feb 2019 03:24:50 +0000 (22:24 -0500)
Use gtk_root_get_for_surface instead.

gtk/gtktooltip.c

index 592d56d88aefb4ef0a5d7b396e28943247d8a98d..ee37687b6808a5c7c1c98ba2c2943017a611c5b3 100644 (file)
@@ -35,6 +35,7 @@
 #include "gtkwindowprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkaccessible.h"
+#include "gtkroot.h"
 
 #ifdef GDK_WINDOWING_WAYLAND
 #include "wayland/gdkwayland.h"
@@ -428,7 +429,7 @@ _gtk_widget_find_at_coords (GdkSurface *surface,
 
   g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
 
-  gdk_surface_get_user_data (surface, (void **)&event_widget);
+  event_widget = gtk_root_get_for_surface (surface);
 
   if (!event_widget)
     return NULL;
@@ -499,7 +500,7 @@ gtk_tooltip_set_last_surface (GtkTooltip *tooltip,
                               (gpointer *) &tooltip->last_surface);
 
   if (surface)
-    gdk_surface_get_user_data (surface, (gpointer *) &window_widget);
+    window_widget = gtk_root_get_for_surface (surface);
 
   if (window_widget)
     window_widget = gtk_widget_get_toplevel (window_widget);